remove leftover conflict marker.

diff --git a/ChangeLog b/ChangeLog
index 21c2c75ab5d3ad1d2ca8319820cb8bb66460673c..ac960e777274c82c44d38f5ac2df2f93dcef8478 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
        accel path is from a locked accel group.
 
->>>>>>> 1.3353
 Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_focus): include internal

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 21c2c75ab5d3ad1d2ca8319820cb8bb66460673c..ac960e777274c82c44d38f5ac2df2f93dcef8478 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
        accel path is from a locked accel group.
 
->>>>>>> 1.3353
 Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_focus): include internal

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 21c2c75ab5d3ad1d2ca8319820cb8bb66460673c..ac960e777274c82c44d38f5ac2df2f93dcef8478 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
        accel path is from a locked accel group.
 
->>>>>>> 1.3353
 Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_focus): include internal

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 21c2c75ab5d3ad1d2ca8319820cb8bb66460673c..ac960e777274c82c44d38f5ac2df2f93dcef8478 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
        accel path is from a locked accel group.
 
->>>>>>> 1.3353
 Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_focus): include internal

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 21c2c75ab5d3ad1d2ca8319820cb8bb66460673c..ac960e777274c82c44d38f5ac2df2f93dcef8478 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
        accel path is from a locked accel group.
 
->>>>>>> 1.3353
 Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_focus): include internal

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 21c2c75ab5d3ad1d2ca8319820cb8bb66460673c..ac960e777274c82c44d38f5ac2df2f93dcef8478 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -135,7 +135,6 @@ Tue Apr 16 07:53:49 2002  Tim Janik  <timj@gtk.org>
        * gtk/gtkwidget.c (_gtk_widget_get_accel_path): export whether the
        accel path is from a locked accel group.
 
->>>>>>> 1.3353
 Mon Apr 15 15:41:56 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcontainer.c (gtk_container_focus): include internal